Migrate to Spring Batch 6 #46216
Migrate to Spring Batch 6 #46216
Conversation
spring-projects-issues
added
the
status: waiting-for-triage
philwebb
added
type: dependency-upgrade
snicoll
added
type: enhancement
| @@ -172,6 +172,7 @@ protected ExecutionContextSerializer getExecutionContextSerializer() { | |||
| : super.getExecutionContextSerializer(); | |||
| } | |||
|
|
|||
| @SuppressWarnings("removal") | |||
There was a problem hiding this comment.
I am not sure what to make of this. The method is deprecated but the class isn't. If we don't want this to be configurable going forward, I'd rather remove the override (and the ObjectProvider)
There was a problem hiding this comment.
This could still be configurable until the method is removed in Spring Batch 6.2. Maybe this configuration option should be documented as deprecated in Spring Boot docs? Wdyt?
| import org.springframework.core.convert.support.ConfigurableConversionService; | ||
|
|
||
| /** | ||
| * Callback interface that can be implemented by beans wishing to customize the | ||
| * {@link ConfigurableConversionService} that is | ||
| * {@link DefaultBatchConfiguration#getConversionService provided by | ||
| * {@link JdbcDefaultBatchConfiguration#getConversionService provided by |
There was a problem hiding this comment.
I think we should relax the javadoc a bit. It looks weird that we refer to that method. Something like
Callback interface that can be implemented by beans wishing to customize the ConfigurableConversionService that is use by the batch infrastructure while retaining its default auto-configuration.
| private JobParameters getNextJobParameters(Job job, JobParameters jobParameters) { | ||
| if (this.jobRepository != null && this.jobRepository.isJobInstanceExists(job.getName(), jobParameters)) { | ||
| if (this.jobRepository != null && this.jobRepository.getJobInstance(job.getName(), jobParameters) != null) { |
There was a problem hiding this comment.
I think something should be adapted in Spring Batch here. JobRepository isn't deprecated but JobExplorer is. The former extends the latter so any method that is not specified in the child is flagged as deprecated.
There was a problem hiding this comment.
Spring Batch was updated. I have removed the @SuppressWarning("removed")
| .getNextJobParameters(job) | ||
| .toJobParameters(); | ||
| return merge(nextParameters, jobParameters); | ||
| } | ||
|
|
||
| @SuppressWarnings("deprecated") |
There was a problem hiding this comment.
Not sure I see what this suppresses.
There was a problem hiding this comment.
This was meant to suppress the warning about the call of the deprecated method jobRepository.getLastJobExecution. But this is now fixed.
| @@ -114,6 +107,7 @@ | |||
| * @author Yanming Zhou | |||
| */ | |||
| @ExtendWith(OutputCaptureExtension.class) | |||
| @SuppressWarnings("removal") | |||
There was a problem hiding this comment.
What's the plan to deal with those deprecations?
There was a problem hiding this comment.
Fixed in Spring Batch.
| // the following assertion should pass as taskExecutor is inherited from | ||
| // TaskExecutorJobLauncher | ||
| // assertThat(context.getBean(JobOperator.class)).hasFieldOrPropertyWithValue("taskExecutor", | ||
| // batchTaskExecutor); |
There was a problem hiding this comment.
Please don't comment code like that.
The assertion does not pass because context.getBean(JobOperator.class) returns a JDK Proxy. And that proxy does not have such field. We should figure out why it returns a proxy and it didn't before.
There was a problem hiding this comment.
I updated the assertion.
...est/java/org/springframework/boot/autoconfigure/batch/JobLauncherApplicationRunnerTests.java
Show resolved
Hide resolved
|
There a number of things that should happen in Spring Batch before we can make progress here, notably a status on |
- Fix deprecation warnings - Fix assertion in BatchAutoConfigurationTests - Update Javadocs
|
Thanks for the review.
The deprecation was reverted.
This was fixed in Spring Batch. I will add some inline comments as well. |
This PR upgrades Spring Boot 4 to Spring Batch 6.
Most of the changes are documented here: https://github.com/spring-projects/spring-batch/wiki/Spring-Batch-6.0-Migration-Guide